Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 1 Apr 2010 06:50:44 +0000 (08:50 +0200)
committerJan D. <jan.h.d@swipnet.se>
Thu, 1 Apr 2010 06:50:44 +0000 (08:50 +0200)

Trivial merge